get_block_wrapper_attributes: Ensures that user-provided attributes override the attributes generated by block supports by t-hamano · Pull Request #10922 · WordPress/wordpress-develop

t-hamano · 2026-02-13T10:49:06Z

Note

This PR is the same as #10877. I submitted this new PR because I accidentally closed #10877 and it can no longer be reopened.

Trac ticket: https://core.trac.wordpress.org/ticket/64603

This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.

…verride the attributes generated by block supports

Co-authored-by: Weston Ruter <[email protected]>

github-actions · 2026-02-13T10:49:33Z

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

Core Committers: Use this line as a base for the props when committing in SVN:

Props wildworks, westonruter.

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

github-actions · 2026-02-13T11:02:05Z

Test using WordPress Playground

The changes in this pull request can previewed and tested using a WordPress Playground instance.

WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser.

Some things to be aware of

All changes will be lost when closing a tab with a Playground instance.
All changes will be lost when refreshing the page.
A fresh instance is created each time the link below is clicked.
Every time this pull request is updated, a new ZIP file containing all changes is created. If changes are not reflected in the Playground instance,
it's possible that the most recent build failed, or has not completed. Check the list of workflow runs to be sure.

For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation.

Test this pull request with WordPress Playground.

westonruter · 2026-02-13T17:39:50Z


-		$attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ] . ' ' . $new_attributes[ $attribute_name ];
+		if ( $is_merged ) {
+			$attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ] . ' ' . $new_attributes[ $attribute_name ];


For posterity, #10877 (comment):

In the case of merging style, should special handling be added to ensure that $extra_attributes[ $attribute_name ] ends in a semicolon? The current empty space is only really appropriate for class.

t-hamano · 2026-03-10T10:27:26Z

Sorry for the late reply.

After some consideration, I decided to refactor the get_block_wrapper_attributes() function overall to make it more robust and secure.

Define callback functions that define how to merge or override each attribute.
Sanitize style and class attribute values
More flexibly handle redundant semicolons in style attributes
Added a unit test to directly assert the return value of get_block_wrapper_attributes().

t-hamano · 2026-03-10T10:28:14Z

+		$new_attribute   = is_string( $new_attribute ) ? $new_attribute : '';
+		$extra_attribute = is_string( $extra_attribute ) ? $extra_attribute : '';


Sanitize non-string attribute values here.

t-hamano · 2026-03-10T10:40:21Z

 		);

 		$expected_classes = 'foo-bar-class wp-block-example has-text-color has-red-color has-background has-black-background-color';
-		$expected_styles  = 'test: style;';


We shouldn't have used the invalid inline styles in the test in the first place.

Co-authored-by: Weston Ruter <[email protected]>

Copilot

Pull request overview

This PR adjusts how get_block_wrapper_attributes() combines block-support-generated wrapper attributes with additional attributes supplied by the block renderer, and updates/extends PHPUnit coverage to reflect the new merging behavior.

Changes:

Refactors get_block_wrapper_attributes() to use per-attribute merge/override callbacks for style, class, id, and aria-label.
Normalizes merged style output (e.g., trimming redundant semicolons) and de-duplicates merged class tokens.
Updates supportedStyles.php expectations and adds a data-driven test for merge/override behavior.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

File	Description
`src/wp-includes/class-wp-block-supports.php`	Refactors wrapper attribute merge/override logic in `get_block_wrapper_attributes()`.
`tests/phpunit/tests/blocks/supportedStyles.php`	Updates expected style strings and adds a data provider test for wrapper attribute merging/overriding.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

t-hamano · 2026-03-19T12:51:38Z

+					),
+					'expected_attribute'  => 'style="margin-top: 2px;color:#000"',
+				),
+			),


Fow now, I don't plan to merge individual CSS properties, as doing so would require more complex parsing and feels out of scope for this PR.

Co-authored-by: Weston Ruter <[email protected]>

westonruter · 2026-03-19T13:19:59Z

+	public function data_get_block_wrapper_attributes_merge_or_override(): array {
+		return array(
+			'extra style attributes are merged with block values' => array(
+				array(


This extra array() wrapper should be removed.

Nice catch! Fixed in 21f404f

westonruter · 2026-03-19T13:22:35Z

+	 * @param array{
+	 *     block_type_settings: array<string, mixed>,
+	 *     block_attrs: array<string, mixed>,
+	 *     extra_attributes: array<string, string>,
+	 *     expected_attribute: string
+	 * } $data Data from the provider.
+	 */
+	public function test_get_block_wrapper_attributes_merge_and_override( $data ) {


With the removal of the wrapper arrays, this can be changed to:

Suggested change

* @param array{

* block_type_settings: array<string, mixed>,

* block_attrs: array<string, mixed>,

* extra_attributes: array<string, string>,

* expected_attribute: string

* } $data Data from the provider.

*/

public function test_get_block_wrapper_attributes_merge_and_override( $data ) {

* @param array<string, mixed> $block_type_settings

* @param array<string, mixed> $block_attrs

* @param array<string, string> $extra_attributes

* @param string $expected_attribute

*/

public function test_get_block_wrapper_attributes_merge_and_override( array $block_type_settings, array $block_attrs, array $extra_attributes, string $expected_attribute ): void {

Fixed in 21f404f

Co-authored-by: Weston Ruter <[email protected]>

t-hamano · 2026-03-19T14:09:06Z

@westonruter Thanks for the review!

github-actions · 2026-03-19T14:40:15Z

A commit was made that fixes the Trac ticket referenced in the description of this pull request.

SVN changeset: 62068
GitHub commit: ea53b95

This PR will be closed, but please confirm the accuracy of this and reopen if there is more work to be done.

t-hamano and others added 6 commits February 13, 2026 19:47

get_block_wrapper_attributes: Ensures that user-provided attributes o…

57b548b

…verride the attributes generated by block supports

Remove double blank lines

dd6a4a5

Co-authored-by: Weston Ruter <[email protected]>

Update PHPDoc

68fab57

Co-authored-by: Weston Ruter <[email protected]>

Update PHPDoc

bd3be96

Co-authored-by: Weston Ruter <[email protected]>

Remove space

d5dcbb8

Simplify logic

5cbc4b5

t-hamano mentioned this pull request Feb 13, 2026

get_block_wrapper_attributes: Ensures that user-provided attributes override the attributes generated by block supports #10877

Closed

westonruter reviewed Feb 13, 2026

View reviewed changes

Comment thread src/wp-includes/class-wp-block-supports.php Outdated

westonruter reviewed Feb 13, 2026

View reviewed changes

t-hamano added 4 commits March 10, 2026 17:26

Merge branch 'trunk' into 64564-get-block-wrapper-attributes

ba375fe

Add more safeguards

46877b9

Fix PHPCS error

517f69c

Fix PHPCS error

acf25f6

t-hamano commented Mar 10, 2026

View reviewed changes

t-hamano added 2 commits March 10, 2026 19:34

unnecessary

11e1150

Remove unnecessary test

9445bd3

t-hamano commented Mar 10, 2026

View reviewed changes

Merge branch 'trunk' into 64564-get-block-wrapper-attributes

beb3a42

westonruter reviewed Mar 12, 2026

View reviewed changes

t-hamano and others added 6 commits March 12, 2026 16:23

Add static modifier for style callback function

40caa8e

Co-authored-by: Weston Ruter <[email protected]>

Add static modifier for class callback function

0ea5ebf

Co-authored-by: Weston Ruter <[email protected]>

Add static modifier for id callback function

d68e980

Co-authored-by: Weston Ruter <[email protected]>

Add static modifier for aria-label callback function

810d5ac

Co-authored-by: Weston Ruter <[email protected]>

Use null coalescing operator

eff534e

Co-authored-by: Weston Ruter <[email protected]>

Merge branch 'trunk' into 64564-get-block-wrapper-attributes

2030226

westonruter reviewed Mar 12, 2026

View reviewed changes

Comment thread src/wp-includes/class-wp-block-supports.php Outdated

Don't split on commas

66a9169

Merge branch 'trunk' into 64564-get-block-wrapper-attributes

1deffb5

westonruter reviewed Mar 19, 2026

View reviewed changes

Comment thread src/wp-includes/class-wp-block-supports.php Outdated

westonruter requested a review from Copilot March 19, 2026 10:47

westonruter reviewed Mar 19, 2026

View reviewed changes

Comment thread tests/phpunit/tests/blocks/supportedStyles.php Outdated

westonruter reviewed Mar 19, 2026

View reviewed changes

Comment thread tests/phpunit/tests/blocks/supportedStyles.php Outdated

westonruter reviewed Mar 19, 2026

View reviewed changes

Comment thread tests/phpunit/tests/blocks/supportedStyles.php Outdated

Copilot AI reviewed Mar 19, 2026

View reviewed changes

t-hamano and others added 6 commits March 19, 2026 21:39

Add type for data_get_block_wrapper_attributes_merge_or_override

d7878da

Co-authored-by: Weston Ruter <[email protected]>

Remove unnecessary indent

4c9fe19

Co-authored-by: Weston Ruter <[email protected]>

Improve type for data_get_block_wrapper_attributes_merge_or_override

06bae0c

Co-authored-by: Weston Ruter <[email protected]>

Use PHPStan array shape syntax

a5955f0

Priorize extra attributes

54740cf

Merge branch 'trunk' into 64564-get-block-wrapper-attributes

8bc645f

westonruter reviewed Mar 19, 2026

View reviewed changes

Comment thread src/wp-includes/class-wp-block-supports.php Outdated

westonruter reviewed Mar 19, 2026

View reviewed changes

Comment thread tests/phpunit/tests/blocks/supportedStyles.php Outdated

westonruter reviewed Mar 19, 2026

View reviewed changes

Comment thread tests/phpunit/tests/blocks/supportedStyles.php Outdated

westonruter reviewed Mar 19, 2026

View reviewed changes

t-hamano and others added 5 commits March 19, 2026 22:23

use PHPStan array shape syntax

fd1f9b3

Co-authored-by: Weston Ruter <[email protected]>

Explicitly convert to array

2aeb26d

Co-authored-by: Weston Ruter <[email protected]>

Remove extra array wrapper from data provider

21f404f

Remove extra indentation after 21f404f

0e8d485

Use assertSame to catch additional expected attributes

1ea701e

westonruter approved these changes Mar 19, 2026

View reviewed changes

Merge branch 'trunk' into 64564-get-block-wrapper-attributes

da5ac94

t-hamano closed this Mar 19, 2026

t-hamano reopened this Mar 19, 2026

github-actions Bot closed this Mar 19, 2026

		$new_attribute = is_string( $new_attribute ) ? $new_attribute : '';
		$extra_attribute = is_string( $extra_attribute ) ? $extra_attribute : '';

Conversation

t-hamano commented Feb 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Feb 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Feb 13, 2026

Test using WordPress Playground

Some things to be aware of

Uh oh!

Uh oh!

westonruter Feb 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

t-hamano commented Mar 10, 2026

Uh oh!

t-hamano Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

t-hamano Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

t-hamano Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

westonruter Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

t-hamano Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

westonruter Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

t-hamano Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

t-hamano commented Mar 19, 2026

Uh oh!

github-actions Bot commented Mar 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

t-hamano commented Feb 13, 2026 •

edited

Loading

github-actions Bot commented Feb 13, 2026 •

edited

Loading

westonruter Feb 13, 2026 •

edited

Loading